From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 8 Apr 2011 18:54:05 +0000 (-0400)
Subject: Merge changes from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4173
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cac9db7a6ac4a8aefbf2522c6a5e30c08ebfea72;p=emacs.git

Merge changes from emacs-23 branch
---

cac9db7a6ac4a8aefbf2522c6a5e30c08ebfea72